Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #378

Merged
merged 221 commits into from
Jun 11, 2020
Merged

Merge upstream #378

merged 221 commits into from
Jun 11, 2020

Conversation

richard-cox
Copy link
Member

  • contains entity/entities access improvements

nwmac and others added 23 commits May 21, 2020 11:06
Allow e2e test logging to be controlled by label on PR
noticed that in this commit which updates the stratos console uaa configuration to be simpler and leverage "uaa.endpoint" that the README was using an example referencing "uaa.url" (which I don't think is a param reference? could be wrong?) and still including uaa.port, uaa.host, etc., though it appears that was all replaced by `uaa.endpoint`

no rush; would appreciate if someone double-checked this, I didn't completely confirm or test this, to be honest. I'll look more into it this evening after work. apologies if I'm dead wrong.

thanks for the time
…console

- bumps doc to point to 3.2.0
- fixes the `helm search` command to `helm repo search` (at least that's what it is for helm3?)
)

* Fix exception SidePanelService: container already set on browser back to & return from login
- hit browser back button until login screen temporarily hit
- ERROR Error: SidePanelService: container already set thrown
- This was due to DashboardBaseComponent initialising the side panel twice, once per nav from login pages
- fix is to ensure the panel service only lives in the DashboardBaseComponent rather than whole app

* Ensure initialRequest process is only set up once

* Fix issue where additional pages are refretched after return from log
- nav to marketplace. marketplace should contain over 100 services
- hit browser back to temporarily go to login page and back
- non-first pages were refetched, with one causing a 'write to protected obj' error
```
entity-request-pipeline.ts:94 TypeError: Cannot assign to read only property 'cfGuid' of object '[object Object]'
    at globalSuccessfulRequestDataMapper (cf-entity-generator.ts:173)
    at map-multi-endpoint.pipes.ts:37
    at Array.reduce (<anonymous>)
    at map-multi-endpoint.pipes.ts:35
    at Array.reduce (<anonymous>)
    at getEntities (map-multi-endpoint.pipes.ts:31)
    at map-multi-endpoint.pipes.ts:102
    at Array.map (<anonymous>)
    at mapMultiEndpointResponses (map-multi-endpoint.pipes.ts:101)
    at MapSubscriber.project (entity-pagination-request-pipeline.ts:134)
```

* Fix `+` icon in service summary page

* Fix side panel

* Revert "Fix `+` icon in service summary page"

This reverts commit e5d3916.
Additional changes to support Cloud Foundry code to correct package
Wrap check for missing env var for forked CI
update kubernetes deploy doc to reference uaa.endpoint
@codecov-commenter
Copy link

codecov-commenter commented Jun 1, 2020

Codecov Report

Merging #378 into master will increase coverage by 0.02%.
The diff coverage is 68.15%.

@@            Coverage Diff             @@
##           master     #378      +/-   ##
==========================================
+ Coverage   59.35%   59.37%   +0.02%     
==========================================
  Files        1049     1046       -3     
  Lines       33499    33076     -423     
  Branches     4604     4636      +32     
==========================================
- Hits        19883    19640     -243     
+ Misses      13616    13436     -180     

# Conflicts:
#	package-lock.json
#	protractor.conf.js
```
require(...).create is not a function
TypeError: require(...).create is not a function
    at Object.<anonymous> (/home/travis/build/SUSE/stratos/node_modules/istanbul/lib/report/html.js:7:40)
```
@richard-cox richard-cox merged commit 1f42e83 into master Jun 11, 2020
@richard-cox richard-cox deleted the merge-upstream branch June 11, 2020 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants